From: Peter Michael Green Date: Wed, 18 Sep 2019 00:20:21 +0000 (+0000) Subject: Manual merge of version 4.1.6-3+rpi1 and 4.2.0-1 to produce 4.2.0-1+rpi1 X-Git-Tag: archive/raspbian/4.2.0-1+rpi1^0 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=a142377391dbddb7e494920fc50887c2e6750631;p=pdns.git Manual merge of version 4.1.6-3+rpi1 and 4.2.0-1 to produce 4.2.0-1+rpi1 --- a142377391dbddb7e494920fc50887c2e6750631 diff --cc debian/changelog index 41e68c0,1df0045..c90d789 --- a/debian/changelog +++ b/debian/changelog @@@ -1,32 -1,60 +1,67 @@@ - pdns (4.1.6-3+rpi1) buster-staging; urgency=medium ++pdns (4.2.0-1+rpi1) bullseye-staging; urgency=medium + + [changes brought forward from 4.1.0-1+rpi1 by Peter Michael Green at Sun, 31 Dec 2017 14:27:56 +0000] + * Add -latomic to ldflags. + - -- Raspbian forward porter Thu, 27 Jun 2019 17:34:48 +0000 ++ -- Peter Michael Green Wed, 18 Sep 2019 00:17:49 +0000 + - pdns (4.1.6-3) unstable; urgency=medium + pdns (4.2.0-1) unstable; urgency=medium - * Fix Denial of service via crafted zone records (CVE-2019-10162) - using patch from upstream. - * Fix Denial of service via NOTIFY packets (CVE-2019-10163) - using patch from upstream. + * New upstream version 4.2.0, upload to unstable. + * pdns-backend-sqlite3: ensure default database path is writable. + Needed for WAL mode. + * d/copyright: Update + * Build, but do not actually ship new LMDB backend + * Qualify built binaries at build time - -- Chris Hofstaedtler Fri, 21 Jun 2019 19:07:07 +0000 + -- Chris Hofstaedtler Fri, 30 Aug 2019 10:53:16 +0000 - pdns (4.1.6-2) unstable; urgency=high + pdns (4.2.0~rc2-1) experimental; urgency=medium - [ Salvatore Bonaccorso ] - * Insufficient validation in the HTTP remote backend (CVE-2019-3871) - (Closes: #924966) + * New upstream version 4.2.0~rc2 (Closes: #918661, #916408) + * Bump Standards-Version to 4.4.0 + * Use debhelper-compat v12 + * Revert "Link with libatomic.so to fix build failure on armel" + * Ship DEP12 UpstreamMetadata per user request + * Remove pdns-backend-opendbx. + OpenDBX is unmaintained in Debian and possibly upstream, too. + * Use pdns_control rping in init script. + Makes the init script useful on systemd systems, too. (Closes: #876775) + * autopkgtests: add more guessed workarounds for debci + * Build-Depend on systemd for proper version detection + * Remove preinst code for upgrades from before 4.0.0-3 + * Remove ddeb/dbgsym breaks, from before 4.0.0 + * d/control: simplify Build-Depends and remove old Breaks/Replaces + * d/rules: simplify and sync with dnsdist, pdns-recursor + * pdns-ixfrdist: Add ixfrdist init script + * backends: take schema files from `make install` location + * pdns-tools: install dnspcap2calidns, stubquery - -- Chris Hofstaedtler Sun, 31 Mar 2019 12:48:59 +0000 + -- Chris Hofstaedtler Sun, 21 Jul 2019 20:59:16 +0000 - pdns (4.1.6-1) unstable; urgency=medium + pdns (4.2.0~rc1-2) experimental; urgency=medium - * New upstream version 4.1.6 + * Link with libatomic.so to fix build failure on armel + * Build with protobuf support - -- Chris Hofstaedtler Sun, 03 Feb 2019 14:20:23 +0000 + -- Chris Hofstaedtler Tue, 07 May 2019 09:29:57 +0000 + + pdns (4.2.0~rc1-1) experimental; urgency=medium + + * New upstream version 4.2.0~rc1 + * Ship upstream-supplied LDAP schema instead of our copy + * Add new ixfrdist binary package + + -- Chris Hofstaedtler Sat, 27 Apr 2019 23:55:14 +0000 + + pdns (4.2.0~alpha1-1) experimental; urgency=medium + + * New upstream version 4.2.0~alpha1 + * Depend: libmaxminddb-dev for geoip backend + * Depend: libcurl4-openssl-dev for LUA record type + * configure: drop --enable-libsodium in favor of autodetection + + -- Chris Hofstaedtler Mon, 14 Jan 2019 14:51:37 +0000 pdns (4.1.5-1) unstable; urgency=medium diff --cc debian/rules index 23ae98c,196ae18..e5a9d6f --- a/debian/rules +++ b/debian/rules @@@ -2,23 -2,12 +2,13 @@@ # Turn on all hardening flags, as we're a networked daemon. export DEB_BUILD_MAINT_OPTIONS = hardening=+all + # see EXAMPLES in dpkg-buildflags(1) and read /usr/share/dpkg/* + DPKG_EXPORT_BUILDFLAGS = 1 + include /usr/share/dpkg/default.mk - # Avoid test failure in docker. - export PDNS_TEST_NO_IPV6=1 - - # Backends - backends := bind ldap pipe gmysql godbc gpgsql gsqlite3 geoip lua mydns remote random opendbx tinydns + # Vendor and version + CXXFLAGS += -DPACKAGEVERSION='"$(DEB_VERSION).$(DEB_VENDOR)"' ++LDFLAGS += -latomic # Disable systemd integration on non-linux archs ifeq ($(DEB_HOST_ARCH_OS),linux)